Skip to content

fix(search): Add end date for last 7 and last 30 days - #62375

Merged
kesselb merged 2 commits into
masterfrom
fix-send-until-also-for-7-and-30-days
Jul 30, 2026
Merged

fix(search): Add end date for last 7 and last 30 days#62375
kesselb merged 2 commits into
masterfrom
fix-send-until-also-for-7-and-30-days

Conversation

@kesselb

@kesselb kesselb commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Summary

Found while working on #60766

It also a bit of per-requirement.

The unified search allows to filter for today, the last 7 day, last 30 days, this year, last year, and a custom date range.

For last 7 and last 30 the end date (=> until parameter) was not set. That's not an issue for files or talk because there we just select every file mtime or message timestamp larger than x via sql.

For calendar events the actual expansion of an recurring event happens at php level and currently requires a start and end date. I'm going to add some defaults to #60766 (since set, until missing => max date; since missing, until set => 0), but better would be to send a complete request.

How to test:

  • Have network tools open
  • Open unified search
  • Type something
  • The request on main is missing until, on this branch it's there

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@kesselb kesselb added this to the Nextcloud 35 milestone Jul 21, 2026
@kesselb
kesselb requested a review from Copilot July 21, 2026 22:04
@kesselb kesselb self-assigned this Jul 21, 2026
@kesselb
kesselb requested a review from a team as a code owner July 21, 2026 22:04
@kesselb kesselb added bug 3. to review Waiting for reviews labels Jul 21, 2026
@kesselb
kesselb requested review from kristian-zendato, nfebe and sorbaugh and removed request for a team July 21, 2026 22:04
@kesselb

kesselb commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/compile amend /

@kesselb

kesselb commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/backport to stable34

@kesselb

kesselb commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/backport to stable33

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR aims to complete unified search date-range requests by ensuring the “Last 7 days” and “Last 30 days” presets set an explicit end date (until), which is required by the CalDAV recurring-event expansion logic referenced in #60766.

Changes:

  • Update UnifiedSearchModal quick date ranges to set an endAt value for 7days and 30days filters.
  • Regenerate a large set of dist/ bundles and corresponding dist/*.license manifests.

Reviewed changes

Copilot reviewed 1 out of 228 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
core/src/components/UnifiedSearch/UnifiedSearchModal.vue Adds endAt for “Last 7 days” / “Last 30 days” quick date ranges so until can be sent.
dist/workflowengine-workflowengine.js.license Regenerated license manifest (dependency/version list changed).
dist/weather_status-weather-status.js.license Regenerated license manifest (dependency/version list changed).
dist/updatenotification-view-changelog-page.js.license Regenerated license manifest (dependency/version list changed).
dist/updatenotification-updatenotification.js.license Regenerated license manifest (dependency/version list changed).
dist/updatenotification-update-notification-legacy.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-users-management.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-personal-webauthn.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-personal-security.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-personal-password.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-personal-info.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-sharing.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-settings-presets.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-security.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-overview.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-mail.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-delegation.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-basic-settings.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-vue-settings-admin-ai.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-main.js.license Regenerated license manifest (dependency/version list changed).
dist/settings-declarative-settings-forms.js.license Regenerated license manifest (dependency/version list changed).
dist/files-sidebar.js.license Regenerated license manifest (dependency/version list changed).
dist/files-settings-personal.js.license Regenerated license manifest (dependency/version list changed).
dist/files-settings-admin.js.license Regenerated license manifest (dependency/version list changed).
dist/files-search.js.license Regenerated license manifest (dependency/version list changed).
dist/files-reference-files.js.license Regenerated license manifest (dependency/version list changed).
dist/files-main.js.license Regenerated license manifest (dependency/version list changed).
dist/files-init.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-public-nickname-handler.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-personal-settings.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-init.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-init-public.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-files_sharing_tab.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-collaboration.js.license Regenerated license manifest (dependency/version list changed).
dist/files_sharing-additionalScripts.js.license Regenerated license manifest (dependency/version list changed).
dist/dashboard-main.js.license Regenerated license manifest (dependency/version list changed).
dist/core-update.js Regenerated compiled bundle (chunk hashes/source map query changed).
dist/core-unsupported-browser.js.license Regenerated license manifest (dependency/version list changed).
dist/core-unified-search.js.license Regenerated license manifest (dependency/version list changed).
dist/core-recommendedapps.js.license Regenerated license manifest (dependency/version list changed).
dist/core-public-page-user-menu.js.license Regenerated license manifest (dependency/version list changed).
dist/core-public-page-menu.js.license Regenerated license manifest (dependency/version list changed).
dist/core-public_share_auth.js.license Regenerated license manifest (dependency/version list changed).
dist/core-main.js.license Regenerated license manifest (dependency/version list changed).
dist/core-login.js.license Regenerated license manifest (dependency/version list changed).
dist/core-login_flow.js Regenerated compiled bundle (chunk hashes/source map query changed).
dist/core-legacy-unified-search.js.license Regenerated license manifest (dependency/version list changed).
dist/core-install.js.license Regenerated license manifest (dependency/version list changed).
dist/core-common.js.license Regenerated license manifest (dependency/version list changed).
dist/9906-9906.js.license Regenerated license manifest (dependency/version list changed).
dist/9811-9811.js.license Regenerated license manifest (dependency/version list changed).
dist/9811-9811.js Regenerated compiled chunk.
dist/9553-9553.js.license Regenerated license manifest (dependency/version list changed).
dist/9150-9150.js.license Regenerated license manifest (dependency/version list changed).
dist/8582-8582.js.license Regenerated license manifest (dependency/version list changed).
dist/853-853.js.license Regenerated license manifest (dependency/version list changed).
dist/853-853.js Added a new compiled chunk.
dist/8374-8374.js Removed a compiled chunk.
dist/8192-8192.js.license Regenerated license manifest (dependency/version list changed).
dist/7859-7859.js.license Regenerated license manifest (dependency/version list changed).
dist/7497-7497.js.license Regenerated license manifest (dependency/version list changed).
dist/6798-6798.js.license Regenerated license manifest (dependency/version list changed).
dist/6798-6798.js Regenerated compiled chunk (module reference changed).
dist/6597-6597.js.license Regenerated license manifest (dependency/version list changed).
dist/6505-6505.js.license Regenerated license manifest (dependency/version list changed).
dist/5037-5037.js.license Regenerated license manifest (dependency/version list changed).
dist/4723-4723.js.license Regenerated license manifest (dependency/version list changed).
dist/428-428.js.license Regenerated license manifest (dependency/version list changed).
dist/4271-4271.js.license Regenerated license manifest (dependency/version list changed).
dist/4271-4271.js Regenerated compiled chunk.
dist/4254-4254.js.license Regenerated license manifest (dependency/version list changed).
dist/3486-3486.js.license Regenerated license manifest (dependency/version list changed).
dist/2457-2457.js.license Regenerated license manifest (dependency/version list changed).
dist/2426-2426.js.license Regenerated license manifest (dependency/version list changed).
dist/2311-2311.js.license Regenerated license manifest (dependency/version list changed).
dist/1991-1991.js.license Regenerated license manifest (dependency/version list changed).
dist/1930-1930.js.license Regenerated license manifest (dependency/version list changed).
dist/1764-1764.js.license Regenerated license manifest (dependency/version list changed).
dist/1764-1764.js Regenerated compiled chunk.
dist/1604-1604.js.license Regenerated license manifest (dependency/version list changed).
dist/1598-1598.js.license Regenerated license manifest (dependency/version list changed).
dist/1035-1035.js.license Regenerated license manifest (dependency/version list changed).
dist/1035-1035.js Regenerated compiled chunk.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread core/src/components/UnifiedSearch/UnifiedSearchModal.vue
Comment thread core/src/components/UnifiedSearch/UnifiedSearchModal.vue
Comment thread core/src/components/UnifiedSearch/UnifiedSearchModal.vue
@nextcloud-command
nextcloud-command force-pushed the fix-send-until-also-for-7-and-30-days branch from e8c541b to 9d8801c Compare July 21, 2026 22:17
@kesselb
kesselb force-pushed the fix-send-until-also-for-7-and-30-days branch from 9d8801c to 0b8039d Compare July 21, 2026 22:26
@kesselb

kesselb commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

/compile /

@DerDreschner DerDreschner left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested successfully 👍

@kesselb
kesselb requested a review from susnux July 23, 2026 13:49
@kesselb

kesselb commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

/compile /

@susnux

susnux commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

/compile rebase

@nextcloud-command
nextcloud-command force-pushed the fix-send-until-also-for-7-and-30-days branch from a5e5842 to 8d29f8b Compare July 28, 2026 11:05
@kesselb

kesselb commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

/compile rebase

kesselb and others added 2 commits July 30, 2026 00:36
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselb force-pushed the fix-send-until-also-for-7-and-30-days branch from 8d29f8b to 781d166 Compare July 29, 2026 22:37
@kesselb
kesselb merged commit 8286344 into master Jul 30, 2026
164 of 171 checks passed
@kesselb

kesselb commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

/backport to stable32

@backportbot

backportbot Bot commented Jul 30, 2026

Copy link
Copy Markdown

The backport to stable32 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable32
git pull origin stable32

# Create the new backport branch
git checkout -b backport/62375/stable32

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 95a02993 781d1666

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/62375/stable32

Error: Failed to check for changes with origin/stable32: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants